]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
gdm: unconditionally cancel auth user verifier on reset
authorRay Strode <rstrode@redhat.com>
Wed, 15 Jul 2015 19:52:29 +0000 (15:52 -0400)
committerRay Strode <rstrode@redhat.com>
Thu, 16 Jul 2015 13:41:39 +0000 (09:41 -0400)
We currently only cancel the user verifier on reset if
verifying, but that means we don't properly cancel it when
asking for a username at the Not Listed screen.

The object already handles getting called when there is
nothing to cancel, so just cancel it unconditionally.

https://bugzilla.gnome.org/show_bug.cgi?id=752438

js/gdm/authPrompt.js

index d712ddce49e4a5f164ae81a44fdfc0ff27ad51a8..88d11d7ea1b01a2e57d4f36ce74f40e22baadded 100644 (file)
@@ -433,7 +433,7 @@ const AuthPrompt = new Lang.Class({
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
         this.cancelButton.reactive = true;
 
-        if (oldStatus == AuthPromptStatus.VERIFYING)
+        if (this._userVerifier)
             this._userVerifier.cancel();
 
         this._queryingService = null;